Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 19 Feb 2010 15:29:56 +0000 (15:29 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 19 Feb 2010 15:29:56 +0000 (15:29 +0000)

Trivial merge